Merge from emacs-23; up to r100601.
authorGlenn Morris <rgm@gnu.org>
Sat, 25 Jun 2011 18:21:00 +0000 (11:21 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 25 Jun 2011 18:21:00 +0000 (11:21 -0700)
commitb8a9fbcee52fcfab0ef08f22a703a336654f1beb
tree6025bd51506544342c0037728b07ab4765cd0027
parentab9e5f457d26c07c6296e0d01e2aabe24d5880a7
parent27ef3d5975fc1ac36ce8842e979b735666d91dc7
Merge from emacs-23; up to r100601.
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/lispref/keymaps.texi
lisp/ChangeLog
lisp/net/ange-ftp.el
src/ChangeLog
src/dispnew.c